Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix branch selector UI #30803

Merged
merged 4 commits into from
May 2, 2024
Merged

Fix branch selector UI #30803

merged 4 commits into from
May 2, 2024

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented May 1, 2024 •
edited
Loading

Fix #30802

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 1, 2024
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 1, 2024
@wxiaoguang wxiaoguang added type/bug backport/v1.22 This PR should be backported to Gitea 1.22 labels May 1, 2024
@github-actions github-actions bot added modifies/templates This PR modifies the template files modifies/js labels May 1, 2024
@wxiaoguang wxiaoguang mentioned this pull request May 1, 2024
Closed
@wxiaoguang wxiaoguang force-pushed the fix-branch-selector branch 4 times, most recently from 55e23a8 to 89b67d2 Compare May 1, 2024 10:59
@silverwind
Copy link
Member

silverwind commented May 1, 2024 •
edited
Loading

I too had recent fun with the pain in the ass that is the branch selector in #28163 (comment). Hope we can make one single component for it soon in vue, it's a absolute mess currently.

@silverwind silverwind mentioned this pull request May 1, 2024
Merged
@silverwind
Copy link
Member

What needs to be done is make it work in all places and not have any dependencies on being rendered inside an issue. E.g. a clean reusable interface that works anywhere in a repo.

@silverwind
Copy link
Member

image

Can you put a small spacing between button and dropdown? 4px should be good.

@silverwind
Copy link
Member

image

Last item could use border-radius on bottom.

@silverwind
Copy link
Member

image

"g" is cut off by overflow-hidden caused by a previous PR of mine. Would be a nice to have fix, but must work with long branch names.

@wxiaoguang
Copy link
Contributor Author

wxiaoguang commented May 2, 2024 •
edited
Loading

I too had recent fun with the pain in the ass that is the branch selector in #28163 (comment). Hope we can make one single component for it soon in vue, it's a absolute mess currently.

That's impossible at the moment because there are a lot of legacy code, especially the messy "repo-legacy.js"

For other changes: a4f3236

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels May 2, 2024
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels May 2, 2024
@wxiaoguang wxiaoguang enabled auto-merge (squash) May 2, 2024 09:25
@wxiaoguang wxiaoguang disabled auto-merge May 2, 2024 10:16
@wxiaoguang wxiaoguang enabled auto-merge (squash) May 2, 2024 10:16
@wxiaoguang wxiaoguang merged commit ebe6f4c into go-gitea:main May 2, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone May 2, 2024
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request May 2, 2024
@wxiaoguang @GiteaBot
Fix branch selector UI (go-gitea#30803)
aa26fe8 
Fix  go-gitea#30802
@GiteaBot GiteaBot mentioned this pull request May 2, 2024
Merged
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label May 2, 2024
@wxiaoguang wxiaoguang deleted the fix-branch-selector branch May 2, 2024 10:53
wxiaoguang added a commit that referenced this pull request May 2, 2024
@GiteaBot @wxiaoguang
Fix branch selector UI (#30803) (#30819)
d793f25 
Backport #30803 by wxiaoguang

Fix  #30802

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@silverwind silverwind mentioned this pull request May 2, 2024
Merged
wxiaoguang added a commit that referenced this pull request May 3, 2024
@silverwind @wxiaoguang
Fix JS error on pull request page (#30838)
c4e8754 
Fix this error seen on PR page, regression from
#30803:

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request May 3, 2024
@silverwind @wxiaoguang @GiteaBot
Fix JS error on pull request page (go-gitea#30838)
5814bd9 
Fix this error seen on PR page, regression from
go-gitea#30803:

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@GiteaBot GiteaBot mentioned this pull request May 3, 2024
Merged
wxiaoguang added a commit that referenced this pull request May 3, 2024
@GiteaBot @silverwind @wxiaoguang
Fix JS error on pull request page (#30838) (#30841)
7db434b 
Backport #30838 by silverwind

Fix this error seen on PR page, regression from
#30803:

Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 3, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
6e5359c 
* giteaofficial/main: (30 commits)
  Improve grep search (go-gitea#30843)
  Don't only list code-enabled repositories when using repository API (go-gitea#30817)
  Fix no edit history after editing issue's title and content (go-gitea#30814)
  Ignore useless error message "broken pipe" (go-gitea#30801)
  Fix JS error on pull request page (go-gitea#30838)
  Fix body margin shifting with modals, fix error on project column edit (go-gitea#30831)
  Improve repo button row layout (go-gitea#30668)
  refactor: merge ListActionTasks func to action.go file (go-gitea#30811)
  Prevent automatic OAuth grants for public clients (go-gitea#30790)
  Catch and handle unallowed file type errors in issue attachment API (go-gitea#30791)
  Fix incorrect message id for releaes email (go-gitea#30825)
  Add hover outline to heatmap squares (go-gitea#30828)
  Remove external API calls in `TestPassword` (go-gitea#30716)
  Upgrade chi-binding (go-gitea#30826)
  Improve context popup rendering (go-gitea#30824)
  Fix activity heat map padding & locale (go-gitea#30823)
  Fix issue card layout (go-gitea#30800)
  Fix branch selector UI (go-gitea#30803)
  Fix rounded border for segment followed by pagination (go-gitea#30809)
  Skip gzip for some well-known compressed file types (go-gitea#30796)
  ...
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 31, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny approved these changes

@silverwind silverwind silverwind approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/v1.22 This PR should be backported to Gitea 1.22 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/js modifies/templates This PR modifies the template files size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.23.0
Development

Successfully merging this pull request may close these issues.

broken styles on branch selector when creating an issue
4 participants
@wxiaoguang @silverwind @lunny @GiteaBot